Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rocky Linux 9.4 support #1164

Merged
merged 7 commits into from
Jul 23, 2024
Merged

Rocky Linux 9.4 support #1164

merged 7 commits into from
Jul 23, 2024

Conversation

grzegorzkoper
Copy link
Contributor

No description provided.

@grzegorzkoper grzegorzkoper requested a review from a team as a code owner July 17, 2024 11:12
Alex-Welsh
Alex-Welsh previously approved these changes Jul 17, 2024
Copy link
Contributor

@Alex-Welsh Alex-Welsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as long as CI passes

etc/kayobe/pulp-repo-versions.yml Outdated Show resolved Hide resolved
etc/kayobe/pulp-repo-versions.yml Outdated Show resolved Hide resolved
@markgoddard
Copy link
Contributor

We do need to consider what to do about the --root-dev-only issue, if it's still a problem.

@grzegorzkoper
Copy link
Contributor Author

We do need to consider what to do about the --root-dev-only issue, if it's still a problem.

I have not hit this issue.

Issue in SMS-LAB that Piotr was hitting, was that grub.cfg was completely being removed while upgrading packages from 9.3(older kernel) to 9.3 (newer kernel)
The fix for that was running:
grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg
After upgrade, before rebooting hosts

@markgoddard
Copy link
Contributor

We do need to consider what to do about the --root-dev-only issue, if it's still a problem.

I have not hit this issue.

Issue in SMS-LAB that Piotr was hitting, was that grub.cfg was completely being removed while upgrading packages from 9.3(older kernel) to 9.3 (newer kernel) The fix for that was running: grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg After upgrade, before rebooting hosts

Do you still have an environment running 9.4? If so could you check if --root-dev-only is in /boot/efi/EFI/rocky/grub.cfg?

@grzegorzkoper
Copy link
Contributor Author

We do need to consider what to do about the --root-dev-only issue, if it's still a problem.

I have not hit this issue.
Issue in SMS-LAB that Piotr was hitting, was that grub.cfg was completely being removed while upgrading packages from 9.3(older kernel) to 9.3 (newer kernel) The fix for that was running: grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg After upgrade, before rebooting hosts

Do you still have an environment running 9.4? If so could you check if --root-dev-only is in /boot/efi/EFI/rocky/grub.cfg?

It's there:

[root@gkoper-controller-01 ~]# cat  /boot/efi/EFI/rocky/grub.cfg
search --no-floppy --root-dev-only --fs-uuid --set=dev c209b919-b137-47ad-82ef-bc6cc88323ad
set prefix=($dev)/boot/grub2
export $prefix
configfile $prefix/grub.cfg

[root@gkoper-controller-01 ~]# uname -a
Linux gkoper-controller-01.novalocal 5.14.0-427.22.1.el9_4.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Jun 19 17:35:04 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux

grub.cfg on a non upgraded 9.2 machine (control-host)

#
# DO NOT EDIT THIS FILE
#
# It is automatically generated by grub2-mkconfig using templates
# from /etc/grub.d and settings from /etc/default/grub
#

### BEGIN /etc/grub.d/00_header ###
set pager=1

if [ -f ${config_directory}/grubenv ]; then
  load_env -f ${config_directory}/grubenv
elif [ -s $prefix/grubenv ]; then
  load_env
fi
if [ "${next_entry}" ] ; then
   set default="${next_entry}"
   set next_entry=
   save_env next_entry
   set boot_once=true
else
   set default="0"
fi

if [ x"${feature_menuentry_id}" = xy ]; then
  menuentry_id_option="--id"
else
  menuentry_id_option=""
fi

export menuentry_id_option

if [ "${prev_saved_entry}" ]; then
  set saved_entry="${prev_saved_entry}"
  save_env saved_entry
  set prev_saved_entry=
  save_env prev_saved_entry
  set boot_once=true
fi

function savedefault {
  if [ -z "${boot_once}" ]; then
    saved_entry="${chosen}"
    save_env saved_entry
  fi
}

function load_video {
  if [ x$feature_all_video_module = xy ]; then
    insmod all_video
  else
    insmod efi_gop
    insmod efi_uga
    insmod ieee1275_fb
    insmod vbe
    insmod vga
    insmod video_bochs
    insmod video_cirrus
  fi
}

serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
terminal_input serial console
terminal_output serial console
if [ x$feature_timeout_style = xy ] ; then
  set timeout_style=menu
  set timeout=5
# Fallback normal timeout code in case the timeout_style feature is
# unavailable.
else
  set timeout=5
fi
### END /etc/grub.d/00_header ###

### BEGIN /etc/grub.d/01_users ###
if [ -f ${prefix}/user.cfg ]; then
  source ${prefix}/user.cfg
  if [ -n "${GRUB2_PASSWORD}" ]; then
    set superusers="root"
    export superusers
    password_pbkdf2 root ${GRUB2_PASSWORD}
  fi
fi
### END /etc/grub.d/01_users ###

### BEGIN /etc/grub.d/08_fallback_counting ###
insmod increment
# Check if boot_counter exists and boot_success=0 to activate this behaviour.
if [ -n "${boot_counter}" -a "${boot_success}" = "0" ]; then
  # if countdown has ended, choose to boot rollback deployment,
  # i.e. default=1 on OSTree-based systems.
  if  [ "${boot_counter}" = "0" -o "${boot_counter}" = "-1" ]; then
    set default=1
    set boot_counter=-1
  # otherwise decrement boot_counter
  else
    decrement boot_counter
  fi
  save_env boot_counter
fi
### END /etc/grub.d/08_fallback_counting ###

### BEGIN /etc/grub.d/10_linux ###
insmod part_gpt
insmod lvm
insmod ext2
set root='lvmid/kdPx7n-cEhR-FwYw-B3cT-G4vT-14fy-Tfocmj/bsOCD3-TKk6-UYY1-3J4j-hfuA-y8g1-ezwNg2'
if [ x$feature_platform_search_hint = xy ]; then
  search --no-floppy --fs-uuid --set=root --hint='lvmid/kdPx7n-cEhR-FwYw-B3cT-G4vT-14fy-Tfocmj/bsOCD3-TKk6-UYY1-3J4j-hfuA-y8g1-ezwNg2'  c209b919-b137-47ad-82ef-bc6cc88323ad
else
  search --no-floppy --fs-uuid --set=root c209b919-b137-47ad-82ef-bc6cc88323ad
fi
insmod part_gpt
insmod lvm
insmod ext2
set boot='lvmid/kdPx7n-cEhR-FwYw-B3cT-G4vT-14fy-Tfocmj/bsOCD3-TKk6-UYY1-3J4j-hfuA-y8g1-ezwNg2'
if [ x$feature_platform_search_hint = xy ]; then
  search --no-floppy --fs-uuid --set=boot --hint='lvmid/kdPx7n-cEhR-FwYw-B3cT-G4vT-14fy-Tfocmj/bsOCD3-TKk6-UYY1-3J4j-hfuA-y8g1-ezwNg2'  c209b919-b137-47ad-82ef-bc6cc88323ad
else
  search --no-floppy --fs-uuid --set=boot c209b919-b137-47ad-82ef-bc6cc88323ad
fi

# This section was generated by a script. Do not modify the generated file - all changes
# will be lost the next time file is regenerated. Instead edit the BootLoaderSpec files.
#
# The blscfg command parses the BootLoaderSpec files stored in /boot/loader/entries and
# populates the boot menu. Please refer to the Boot Loader Specification documentation
# for the files format: https://systemd.io/BOOT_LOADER_SPECIFICATION/.

# The kernelopts variable should be defined in the grubenv file. But to ensure that menu
# entries populated from BootLoaderSpec files that use this variable work correctly even
# without a grubenv file, define a fallback kernelopts variable if this has not been set.
#
# The kernelopts variable in the grubenv file can be modified using the grubby tool or by
# executing the grub2-mkconfig tool. For the latter, the values of the GRUB_CMDLINE_LINUX
# and GRUB_CMDLINE_LINUX_DEFAULT options from /etc/default/grub file are used to set both
# the kernelopts variable in the grubenv file and the fallback kernelopts variable.
if [ -z "${kernelopts}" ]; then
  set kernelopts="root=LABEL=rootfs ro  console=tty0 console=ttyS0,115200 no_timer_check nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto  "
fi

insmod blscfg
blscfg
### END /etc/grub.d/10_linux ###

### BEGIN /etc/grub.d/10_reset_boot_success ###
# Hiding the menu is ok if last boot was ok or if this is a first boot attempt to boot the entry
if [ "${boot_success}" = "1" -o "${boot_indeterminate}" = "1" ]; then
  set menu_hide_ok=1
else
  set menu_hide_ok=0
fi
# Reset boot_indeterminate after a successful boot
if [ "${boot_success}" = "1" ] ; then
  set boot_indeterminate=0
# Avoid boot_indeterminate causing the menu to be hidden more than once
elif [ "${boot_indeterminate}" = "1" ]; then
  set boot_indeterminate=2
fi
# Reset boot_success for current boot
set boot_success=0
save_env boot_success boot_indeterminate
### END /etc/grub.d/10_reset_boot_success ###

### BEGIN /etc/grub.d/12_menu_auto_hide ###
### END /etc/grub.d/12_menu_auto_hide ###

### BEGIN /etc/grub.d/14_menu_show_once ###
if [ x$feature_timeout_style = xy ]; then
  if [ "${menu_show_once_timeout}" ]; then
    set timeout_style=menu
    set timeout="${menu_show_once_timeout}"
    unset menu_show_once_timeout
    save_env menu_show_once_timeout
  fi
fi
### END /etc/grub.d/14_menu_show_once ###

### BEGIN /etc/grub.d/20_linux_xen ###
### END /etc/grub.d/20_linux_xen ###

### BEGIN /etc/grub.d/20_ppc_terminfo ###
### END /etc/grub.d/20_ppc_terminfo ###

### BEGIN /etc/grub.d/30_os-prober ###
### END /etc/grub.d/30_os-prober ###

### BEGIN /etc/grub.d/30_uefi-firmware ###
if [ "$grub_platform" = "efi" ]; then
	menuentry 'UEFI Firmware Settings' $menuentry_id_option 'uefi-firmware' {
		fwsetup
	}
fi
### END /etc/grub.d/30_uefi-firmware ###

### BEGIN /etc/grub.d/35_fwupd ###
### END /etc/grub.d/35_fwupd ###

### BEGIN /etc/grub.d/40_custom ###
# This file provides an easy way to add custom menu entries.  Simply type the
# menu entries you want to add after this comment.  Be careful not to change
# the 'exec tail' line above.
### END /etc/grub.d/40_custom ###

### BEGIN /etc/grub.d/41_custom ###
if [ -f  ${config_directory}/custom.cfg ]; then
  source ${config_directory}/custom.cfg
elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then
  source $prefix/custom.cfg
fi
### END /etc/grub.d/41_custom ###
[root@gkoper-ansible-control ~]# uname -a
Linux gkoper-ansible-control.novalocal 5.14.0-284.30.1.el9_2.x86_64 #1 SMP PREEMPT_DYNAMIC Sat Sep 16 09:55:41 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux

Updating Rocky 9.4 only.
Copy link
Contributor

@markgoddard markgoddard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to stop blocking this based on the --root-dev-only issue because it also affects our 9.3 snapshots. We should still try to address it though.

@markgoddard markgoddard merged commit b5e3554 into stackhpc/2023.1 Jul 23, 2024
12 checks passed
@markgoddard markgoddard deleted the rocky-linux9.4-support branch July 23, 2024 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants